[Bug Fix] Missing factory object