Fixed single server bug in step 1