Fix porting problem