Second fix attempt
Merge pull request #6989 from atlantiscze/door-fix-mk2

Fixes #6985