EmirH: fixing bug