Tried to fix email forwarding bug