yaya (fixes #11 i think)