Fix in SF 2.3