Fixed ambiguous columns