Fix crash in first step