Replace - with _ in the dict, fix connection problem