FIX: Fix client