server: bug fix submiited by Steve Haynal