Fix for pre-fetching values on page.