fix for work with server