onDestroy modified