Fixes #328