Fix CONTROLLED, RESTRICTED