Changing method of building, remote calls are broken