fix issue #560
Merge pull request #563 from TrustNik/1.6

fix issue #560