fixes #1626