Fix first data creation