Fix bug and add debug macro