Fixes #4681 and some more untracked similar issues
Thanks for that!
Pull-Request has been merged by pingou
Fixes #4681 and some more untracked similar issues