SOS-2406 Proper fix
SF