Fix before filter bug