fix scope issues
0.3.2