Correction of first server implementation