bug fix for server