Trying to fix api bug