Fixed insertion issues.