Fix first behavior