Closedown fix