Fixing small bug in current client maintainence