Fix first iteration problem