Debug emails fix