Finalization of the CommandAction fix #50