DEBUG MODE ENHANCE! (well, fix :P)