Bugfix on RETRIES