factor-ize (fix)