fixes #1509