fixes #1612