server bug fix