Class filter fix