Fixing moved comments