fixes #1506