Fixes #71 or at least good enough