tested map; fixes #3