Fixed last changes