Fix porting issue