Change to fix issue with counting fields heights.