Fix return of non memory tracked variables [ci skip]