Fixes #288