Fixed the email overlapping issue