I'm pretty sure this really fixes #3, now