Working on server/client bug fix