Fixed resource loading with a hack...