Fixes #284