UC-85 fixing bug