Fix watch away numerics, #937