Fixed to make proxy work