Module Filter Fix