Fixed global functionality