adding fix for other fields