Fix storage duration check