UC-115 fixing bugs