[0017] A validation fix 2