Fixes #158 better