Uhh, ignore that last fix for #9, this really fixes #9