Fixed before filter issue