fixes #1498