Fix the watchPath/unwatchPath bind inside watchOrUnwatchEntry