Fixed change watch during saves