Trying to fix the selector's