Finally fixed grid loading