Updated global selection - working around bug