Fix "/uhc" bug