Fixed bugs introduced by change
Switched order of operands for multiply-accumulate