Bug fix on Filter Class (lack of testing)