fixes #1688