Fix logic...