fixes #1670