Fixed both APIs