fixed handling remote updates