Fix ACS detection properly