fixes #2122

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