Fixed isset conflict