Fix api issue