Fix API Response inconsistent issue