fixing issue #1454
Merge pull request #1455 from regular/master

fixing issue #1454