Server fix #892222123