fixes #1660