Fixes #3533
rebased onto db853bf52dc29e300cf112080de4ae182efc508e
Looking good and working in my local testing :)
Pull-Request has been merged by pingou
Fixes #3533