LS: Overlapping bug in latest commit