fixes #1631