fixed bug to working (but not ideal) state on update during watch