Fix issue #20: exclude doesn't always work