bugfix for watch