Fixed a small bug, but not the cause of this issue. Still working on the segment-selector bug.