ticket:73 last changes