bug fix, handle lists appropriately.