Accidently removed some black magic (aka pass by reference) in last commit that broke some pages