Replace bpwatch until upstream issue is fixet