Fix always skipping first step