Bugfixes: brute force support restored