Fixes #1458