Fix for singleton filtering.