Fixes #1531