Fixed #1854 by using wizzud's suggestion.  The only real difference is the code is only called when there is more than a single selector.  So there should be no speed decrease in the current working cases.  Only additional functionality for cases that used to fail.