last changes for #183