Temporary fix for #648
Merge pull request #692 from da-kid/master

Temporary fix for #648