Fixed ammo form
Merge branch 'hotfix/12-13'