fix stop/clear bug