fix for watch bug, probably wrong but still working here :)