Tried another workaround to avoid e-mail errors