Added debug code to catch the issue