before filter fix