Porting a bugfix from the modular-upto dir