Fixes #3922
Going to merge this one manually to save you the rebase :)
Commit 0a2162fb fixes this pull-request
Pull-Request has been merged by pingou
Fixes #3922