fixes #1635