The solution above (no new storage) would solve that problem.