Fixed issue on tree<1.5