Fix logic another bug