fix the issue when set in storage