Fix negative shadowing bug