Update subs to fix crash