Re-use existing variables, patch from Tito
1 file changed