Fixes #1509