Fixed overlap issue once and for all