Fix incorrect code removal in 3680ff9b /issue #39