LOW / New attempt to fix fib validation issue