FB 5652 - more visible scope changes