improved availability gap fix