Fixes #399