This fixes some bug that I don't have time to investigate right now. Annoying! I suspect an assumption in usb_mem that I'm forgetting about.