GCP-8542 fix retrieval of factors