fixes #1507