Fix arguments passed to get_selected_gateway()
Closes: #3658
Merge remote-tracking branch 'kali/bug/3658_fix_get_gw_arguments' into develop