bug fix on server side