Fix action ordering