Same fix for clockworkd