Modify to pass "action" option correctly