Bug Fixed in CLient Class