fix ext_storage

need testing