Temporary fix for #80

(fixes #80 for now)