Fix #624

Only fixed filters issue.