Fixes #1530