Fix small bug with FIRST