Fixes #1406