Fixing "Unable to find page..." bug