Work on server set bug fix