fix to storage ownership