FIX: issue #540 (Multiple #system-global broken)