recreated map and fixed client ?^^