Fixed issue with saving all of guardian fields