Fix Undefined Custom Fields