Fix DEBUG mode