Fixed ambigious step matches with generic "within" step