Make on-based supplies also work well with .close.