Fixes #1405