bug fix and eachFrom