Fixing default mechanism selection