add hack for multiple endpoints