Fix small error with latest merge