Fixed a crash in 460-471