Implemented storage fix.