Fixes #168