Format fixed in Client and Server - Rhett