#153: last changes