fixes #1606