Finally fixed yell bug (will work for mail in the future also)