fixed map traversal