Fixing compatibility switching