Fixed issues raised in pull request #1780