Add another TODO for scrolling corner case