Fixes to the fix for #1367
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM.git