Fix insertion
Merge branch 'fixInsert' into develop