Base: Fix previous commit affecting wrong page