Fixing Logic