Fixes #1405, closes #1406.