Fixing logic...