Bug Fux: Reference correct master variable
Merge branch 'function_bug'