Fixes #186