Fixes #6090 - Proxy import