Fix reload issues! Woooo!