Fix Switch between Internal and External storage (No unit tests yet)