fix strange logical to do retry