Fixed argument passing
fix +/* order of operations.