4.4 Fix for watch freezing