FIX: Global elements was missed