Fixes #189