Fix code broken by poor merge