[geometry] Adapted buffer for recent changes in within