Fix crash bug from refactor