PROPER self_actions fix :)