quick validation fix (TODO)