fixes #1616