fix shadding bug