Fix logic of that