updated last fix to include all pages