Fix incomplete code removal in 9abbfa43 /issue #39