fixed to make working on server