Bringing in line with changes in FOF 2.1