fixed bug with override OnStop()