improve fix for GH-786 plus test it and also backoff