Fixes #395