Tart up filter to fix #978