Fix Issue 589
Merge pull request #591 from semlanik/semlanik/589

Fix Issue 589