Potential fix for #1

Potential fix for #1 

What do you think @larsacus ?