Fix to filter return value