Fix breakage of BAA's GEP decomposition -- turns out it's important to bump the index during an early test