server sided bug fix