duplicate server calls fix