ZF-tool working again