Fixes Bug 1060164 - [RPP] trigger the functions appropriately