Fix restart on changes bug