Fixed non working globals