fixed clientside bug