Fixes #405