Fix crash in 2.3.3