fix DHSPAP conflict