Fix/pagepart generator