fixing for server helper