fix to new Factory