fix  #1534, fix #1493
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM