Fix to actions getting mixed up with surface actions.