Reverted to use the default get_argument()