For #61 : fix filter