2_5 and 3_5 bugs are fixed