Fix overlapping panel barriers with multiple panels