add additional check not to trigger digest loop
delete unneded check