ppm vhook follow up patch by (Charles Yates <charles dot yates at pandora dot be>)