NonCollection Reference Fields fix