workaround for BZ 953499
Merge pull request #2023 from xsuchy/pull-req-953499

workaround for BZ 953499