maybe fix for #1810, needs MP testing
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM