Fixes #387