Fixes #281