Python3 fix
Handle actions as well