Fixing logic