Fixes #257