Attempt to fix -f filename parsing