[Martin, Neilen] Fix order of start/close.