Fix issue on server environment