fix for scroll issue needs to applied to all versions