CGIV-4304: Also helps to use the correct action