Fix code to match