Fix storing on main call