More robust loading