Fix Error on dealloc
Make the fix more proper
Quick fix for [Observing Issue](https://twitter.com/omarojo/status/293402948682252289)