fix last changes