added fallback for mountpoint mode