Fix onDestroy vs destroy