Fixes #169