double-filtering fix