Fixed a selector issue which were causing havoc and mayhem.