fixes #1615