fix for issue 484
Merge pull request #488 from Azaezel/484

fix for issue #484