bugfix automic quantity
merged conflicts