Fixes #31 (I think :p)