Fix back-porting