Merge of another fix from Monyo.