Fix Axes matching by adding lookahead