Remove bug on data submission