Fixed issue with BulkSelector(?)