better close (?)

Change-Id: I697357f6695365e2c8c40ef5133d6a15e8daf17a