Fixed double insertion issue