Fixes shadowing bug