fix loading order
fix crash