fix passthrough vars - add check