2nd attempt at fixing these nasty scoping isuses.
0.16.7