Fix issue with histograms and custom sources