Fixes #266