Fix for filter_tbs