Fixed validation shortcut implementation