Add workaround for bug 9382, which introduced by fixing bug 5933
Merge pull request #1096 from 9rnsr/fix5933

Add workaround for bug 9382, which introduced by fixing bug 5933