fixes #1710