Fix crash caused by last commit