Database first insert fixed