Fixes #393