bugfix fro multiple pages