Fixed filtering issue #9