Rework to make getRRDValues work