fixes #1636