Fixed stupid shadowing and bug pointed out by the silence.