[FIX] Leaves should have  context to convert and should convert the proper way