Fixes #184