Little fix on page management