Adding a filter for issue #17