fixes #1720