Fixed hashtree create
Merge branch 'aae' into fifo