Fixed evaluation order bug -- first time I've done that!