fix stop and stream bugs