Fix issue with multiple use of "DEBUG"