Fixed to PumaClient