fixes #2090