Fix for sf storage.