fixes #1675