Last validation fix.