Modified per tests with Bokeh.