possible fix for watch bug (untested)