fixed bugs client