Fixes #400