Attempt to fix email bug