Proper fix for SF