fixes #59 in server side
fixes #59