Maybe fix run order?