HOME: Fixing bug: step 3 ( from server )