Fix #290 (Reg issue when custom clock + bundle)