fixes #2172