make the scope hacks work a little better.