Handle the next build being in a queue correctly

Do not merge yet