fix loading order