Fixes #293