Fix problem in loading order