Jeremy Newman : fix issue of detection overwriting incorrect var