Message Filter bug fix