Fixes #212