Bug fix on initial scroll