Create Watchdog API fix

Read comments on current problems and how to apply this fix.