Fix code broken by previous commit