Ensure the naked check is not repeated unecessarily