Fix first step bug