fixed data reconciliation problems when server is not master server (issue #1231)