Fixed insert legacy issue