Issue #25. Storage enabled