fixes #1619