Solved some bug with the data array