Scope issue fix
1.6.4