fix issue 545
Merge pull request #546 from Kreattiewe/master

fix issue 545