Fix loading order