fix page generation?