Second attempt at fixing missing back-off issue