change to fix bugs from MOM remote connections