Fixed crash in my prev commit