bugfix in Dispatcher - use xs for selecting