fixes #1629