EmirH: fixing border