Cleaned up proxy bug