Fix HANDWIDTH feature to be more reliable.