Bug fix: remove the selector before doing the callback, in case client