Added DEBUG condition