fixes #1684