Add another workaround for concat ambiguity

Ref #240
Update tests