Histogram by-pass, ugly hack, and type fixed