Fixes #222