Fixed passage of variables to pages