Current pages fix