Fix issue Server 500