fixes #1815

Fixed the issue and pushed code for review, please check it.