Factory bug correction
Factory bug correction