Fixing indentation mixing