Added fix for bug 12 to client server process