some APIs fix