Another scroll bug, related to previous commit.