fixes #2011

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