Implemented retry mechanism. bugid:111131