general fix for pages