Fix run order