Mapping Server/Mahine state fix #45