Adding crutial bug fix in server