Prevent weird double bar bug.
Merge