[BUGFIX] Fix nasty proxy bug