Improve passability between events in the same layers