fixing last changes