Properly modify action context