fix for class order in loader