Also catch adaX Fixes #3112