Fix crash due to my latest cleanup