fix mounting/unmounting