fixes #1559