Bug Fix to allow custom selector to work