Fix * and +