fixes #3198 backport