Fix action variables not being set always