Trying to fix email bug