Another scope fix