Fixed shadowing bug