fixup! Use directive for scroll check