Fixed arithmetic functions 2