Last fix breaks hpx->Draw() from a file. More investigations are needed.