This is an explicit fix for issue #224. This still shouldp probably be
addressed in a more complete fashion (sharing factor creation code), but
right now this fix is needed to support issue #265