Fixed "actions left problem" after the merge