Proxy type selection

also fixes #963