Fix bug where some b-encoded maps were lost