Fixes #279