removing hack, re #128
missing parens
rearranged results