fix from   evo bugfix branch