Fix crash caused by #442 fix