Fix disabled actions handling