Fix for pre_validate recursion