Fix workaround of page=0

Still a workaround.