Fix loading from csv