Fix logic
Fix logic