Try and work around Matplotlib 1.1 issue