Small fix during close