fixed: last changes