Applied fix to store method also