Fixed range rebuilding in [