Replace bpwatch until upstream issue is fixed