Bug fix in pages