Added proper (buggy) filtering