Fixes #1402