Fixes #87 (I hope)