Fixed comment email issue