Fixes #255 a bit