Elaborated on UC7 to decrease its ambiguity

This pull request is related to #171