Fixed FileName from getting stuck