Fist attempt at fixing fliter issue.