Fixed name var issue temporarily