CHANGE: Optimise fix for loading errors.