Page class fix