Added fix to compund fields
Added fix to compound fields