Fixed DEBUG mode