fixes #1480