fixed crashing storage