Fix mount point not always unmounted