Fixes #385