Fixed client bug!!