Fix #26 : wrong variable used. Actually the fix is on some useless code.