fixes #1596