Fix mess with scope