Fixes #261