Removed proxy, found better solution