Client Fix

Client Fix