Merge pull request #521 from Maaack/fix-global-state-loading