Fixes #389