Fixes #402