That bugfix could go straight on `master` I think