Fixes #159