fixes #1600