Fixed last comments