Fix the bug on master, without the code changes from debug or printf

