Fix make logic