Fixes issue #488
Merge pull request #491 from retromodular/patch-488

Fixes issue #488