Fixing bug in Histogram calculation for Non Row Containers