scalar matrix promotion / parallelization bug fix