Added condition to check for a selector before calculating it's position
Pulled latests from v2.0