Quick fix for #79

Untested :)