Bugfix of basket calculation