fix calculate bill bugs