Fix logic another bug again