fix page management