Potentially fix NPE when using /f f