Fix for field values containing ': '