Added on stop for fix crashing error