Another fix for email bug?