fix #389. Filtering shouldn't stop prematurely