Fixed ScrollWatch