Fixed flat pages issue