Add workaround to retry waitFor until it is success or retry count is 0

Add workaround to retry waitFor until it is success or retry count is 0 #375