Fix missing locals bug
Merge branch 'mrbarbasa_master'