master fix before filter