Fix crash in 41daa79