ITTE-1163 - Fixed bigs in clent and server