Client filename issue fixed
TODO: fix server filename issue