Avoid using filter alltogether (Issue #1822)