Fixed some loading errors in special circumstances.