fixed show-stopper bug that said 1+2=2

OMG, should definitely merge it to master branch