Fixes Deaf Bug and Recursive stuff
Merge pull request #3053 from ChuckTheSheep/Recursive-Fixes-and-Deaf-Bug-Fix

Fixes Deaf Bug and Recursive stuff