Fixes #173