Fixing over-optimistic shortcut in factor.