[master 1/2] Add umount next to unmount method to avoid miscall