Change global member var to @current_member