Fix crash in 664c187