Fix check for custom or non-custom factors in phase one