Proposed fix for pages issue - OLD - Please delete, reject or ignore.