Fixed double loading of data