Fixed ambiguous match of drop-down step with generic within step