Fixes issue #486
Merge pull request #497 from gdrooid/GUID-fix

Fixes issue #486