Real fix for #51, ugh