Bugs fixed
Client error fixed