Fixed another load-order related bug