Hopefully fixing the double-selector issue.