change stop from cast to call