Fixes #225