Fix related to scroll to issue 16