better unmount support