Fixes variant on issue #84.