2.2.3 - Avoid some mention edge cases