And another potential validation fix