Fixed super globals matching