fixes #1607