Fixed bug in watch evaluation