Minor bug fixing in billing