Do not always check for the factor being None