Fixes #394