Fix bar ID
Merge with master