Correct multiplication handling