Fix error with quantity
Merge branch 'hot-fix'