Bug fix for concat'ed use