Fixing (definetely - i hope) the retry bug