Fix DB submit