Fix so that 'page' and 'pages' will work