Fixing logic?