fixed issues on Server