Fixed  overshadows variable error (WARNING IT IS NASTY HAHAHA)