fixes #1595