Bug fix
Bug fix (client side)