Fixed possible issues with watch callback ordering