Fixes #390