Fixes #1533