onDestroyed() bug fixed