Fix DEBUG case