Fixing issues resulting from merge of pull request 187.