Really fix crash bug (fix error in previous commit)