Temp (?) fix for last page not working