Filter regression fix