Bugfix for Filtering