Fix filter regression, re #136, closes #139