Merge "Fix bug map entry"