fix mapping and avoiding re-push objects