7/11 Fixed field errors